PopupSwitchMenuItem: allow toggling without closing the menu

Similar to what Gtk does, now toggling with Space does not close
the menu.

https://bugzilla.gnome.org/show_bug.cgi?id=664416

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index aca4ae3de15203aca1db26a2586da8e109c3ecd6..58ca000fa7655d13125d1be1514b6514a8eb1d83 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -774,6 +774,12 @@ const PopupSwitchMenuItem = new Lang.Class({
             this.toggle();
         }
 
+        // we allow pressing space to toggle the switch
+        // without closing the menu
+        if (event.type() == Clutter.EventType.KEY_PRESS &&
+            event.get_key_symbol() == Clutter.KEY_space)
+            return;
+
         this.parent(event);
     },
 

diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index 7862477bfe848774ef8e5f1a01e6dc0fd5aa79f2..6c7de8ed6c1da9de2697aebf042d247d42d339c8 100644 (file)
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -613,7 +613,7 @@ const UserMenuButton = new Lang.Class({
         this._statusChooser = item;
 
         item = new PopupMenu.PopupSwitchMenuItem(_("Notifications"));
-        item.connect('activate', Lang.bind(this, this._updatePresenceStatus));
+        item.connect('toggled', Lang.bind(this, this._updatePresenceStatus));
         this.menu.addMenuItem(item);
         this._notificationsSwitch = item;